Enterprise Version
(attention to design